[Faris] : Major changes to UI -- to be continued.