Moved HTML to partials

Clean up!