Option panel added, cleanup required