change the dimension switching to a single button
make the dimension change loop 2->2.5->3->2
Merge branch 'three-d-fix'
fix merge issues