Refactor layouts and introduce a menu