Improvements to styling and refactoring layouts