Fixed some colors
Modified the menu