Add retire function, adjust views