More cleanups, variables and handling quick update/create forms