Merge pull request #94 from Useful-Innovation/johans-fixes

added validation to edit time/purchase
Merge pull request #95 from Useful-Innovation/johans-fixes

added estimate preview function