UI changes n reverts
removing classes
UI changes incorporated
Merge remote-tracking branch 'origin/master'