tidied up, added comments, added nav positions to theme build