Moved stuff around, cleaned html