remove margin, update var names
remove redundant border color
compile
Merge pull request #194 from meetup/pill-flushing

Pill flushing
conflict res