Abstracted as much css as possible
Merge remote-tracking branch 'origin/master'