Clean up answer form, edit layout