removed old form and list, will be re-implemented
various changes and fixes in client