Simpler navigation and some layout fixes (small screens mainly). Test
it. :)