7th Draft

Mostly css/html changes