More refactoring and set top bar to fixed.