More cleanup, very basic start of front page.