Added "Add Current Tool" Button, Cleaned up code