changed layout and navigation