menu + layout updated