Refactor code and add implemented methods to the tool pages