seprated drawer and nav out into templates and other small tweaks