Switch to new layout
Fix form for description