Fixed layering problem