Fixed a bug from merge conflict pertaining to undos
Rudimentary background color support
Renamed fill button to answer button