Core: menu optimizations (duplicate code removed)
Merge branch 'master' of 192.168.0.5:subrion
Merge branch 'master' of 192.168.0.5:subrion