Tidied SASS & fixed issues with sub nav