cleaned up display on where, improved controller action