Reverted back to layout - no drag and drop