UI Layer management improvements