More changes to camera, layering of camera action buttons in progress