fix(topbar): Cleaned up code