Continue working on ajax component improvements/refactor