Add moar styling!
Fix merge conflicts