website redo

Still a work in progress, but the main site is back on track..