Refactor layout, fix nav active