Fix #400 and do some minor reshuffling of the task form