fixed menu
fixed conflict in apps/layout
slight style changes