visual changes and fix for controlers