Some ui and x.controller updates