remove layout select from UI
upgrade form handling