Added CSS and made layout more legit
Merge conflict fixes, combined changes