Slight design and menubar changes