Refactor layout and fix tabs on login