Some more changes after bringing in Fragment

Restored all UI interactions which we used to have