MOD: Refactor HTML/CSS