HTML/CSS cleanup in progress