use buttons where applicable
clearer variable naming convention
tidy up date fields