Camera button added and other misc changes