Added CastleGateView and fixed some menu views
Merge origin/master