Fix Track Controller visibility issues