Code cleanup: Move layouts to a separate file

[jetpacktuxedo]

I should probably be using a header file to hold the desired layout. It is low priority, but it would make things less cluttered.