Adjusting to API changes in galley for Galley#12
more work on the layover UI