DoubleClick added. UI simplified