Fix compositing issues, prettify other things.