Added back drag functionality + minor changes.