Align to new design
Add nav bar