Buttons added to screen with drag and drop capability. Still buggy though