Modularized the css more — mostly abstracted now!