added tabs to shipyard screen
Merge origin/master