Camera problems'  Finish UI First

As described in Trello, we are having Camera issues, need to change it
accordingly.