Fixed: Corrected form id's, small code cleanup.