Merge "Options Menu layout changes"