Update layout

looks somewhat less awful