UI fixes in layering and overlap