crud layout fixes