PR for code review

I also used finish for backpressed and cancel buttons