Added undo and clear buttons to the place where they belong. See #143