Added more controls to form2. Removed unused files.