Updated FormAdvanced and event listeners