fix html, clean up UI + code style