Few Design changes on Tool