Improve navigation - and fixed template