html fixes & cleanup