UI bug fixes and back Button