Fix some layering issues with help from keikoku.