Fixed #32
Layout tweaks