Add camera to fragment
Add few utility classes
Cleanup some code