most of new design
duh, sass watcher
merge conflicts fixed
Merging.