Fix minor style issues
Seperated layout styles