Finished select and draw buttons
Fixed merge conflict