More layout revisions, ready for production release now maybe