Merge pull request #248 from Useful-Innovation/davids-fixes

Fixed CSS on edit/estimates
Merge pull request #249 from Useful-Innovation/davids-fixes

Fixed CSS