Refine CSS, move navigation controls into their own template