layout changes - based on feedback