Some minor updates to the screens is done. Also, TS2 and Target have been added in their sub windows into the main navigator with detach functions working.