Fixed UI related bugs

Fixed UI related bugs
I cleaned out the code to remove navigating handler