Modifying topbar (NewTopBar class to avoid conflicts)
Conflict resolved