Re-added navgation highlights, tidied template directory