Cleanup, putting html in views folder