|#462| +Rahul, Jaideep| Highlighting selected tab, moving add button and other UI fixes.