Tidy up, fix indentation, remove hover state from disabled nav elements