Added MenuItem style, and small layout fix