good progress on pr feedback and conditionalized layout for ajax