added button
finished drawing button
Added detection of create button
fixed merge conflicts