Resolve minor issues + drag and drop