Tidy up
Switched to headstrong as default layout