tweaking layout and nav