Added Views menu button and menu using checkbox hack
Merged, fixed conflicts