improved pretty controller