Fixed layout again.

Last commit actually ruined layout. Added a tab to the test app to test
that shiz.