Fixed upgrade layout actions