Refactored css and loading space