Menu and heading fixes