WIP
coffee finished
merge master
refactor css
remove repetitive section