Use application layout and fix unit test to not be totally busted