Fixed layout and cleaned up styles
Fixed layout styles and cleaned up code