Tested basic layout
Closes #1