UI bug fixes and back Button
Merge pull request #27 from sagpatil/sagar_sprint-_1

UI bug fixes and back Button