Minor rework of menu. Change color and placement of things