Reworking menu layout