Addresses #303, #365, #296, #297 (some completely and some partially) - update form styles and drag n drop