Fixed top bar issues