Add top bar, clean up