Refine and reorganize legacy topbar