Make layout less funky