Made topbar better