Changed the implementation of Top Bar Controller

Changed the implementation of Top Bar Controller