Cleaned up styling and links
Merge branch 'master' into cleanup