Fixed layering issue