more crud layout fixes