Use flatblock
Layout tweaks