Working on drag and drop, fixed some layout stuff