Improved UI ( TabBar with icons, Top Bar with buttons )