Enhance control views, clean up code