Gift view works now and tables sync with master a bit.