Updated UI - SpaceOrge
Other small fixed