final commit! history + cancelation + main page enhancements