get rid of Divs and refactor CSS