Fix layouts
Add initial controller specs
change top menu icon color to white