Added view controls

and some other misc changes