Eldar: Apply designer fixes.