merging with new view menu features