Minor UI changes and camera update