Add camera button and minor changes