Layering tweaks and border fixes