fixed menu for apartment screen
Merge branch 'master' into lumin