CSS / HTML refactor
HTML / CSS Refactor