JS clean up and completed main nav