Fixed the UX controllers to deal with LAZY (needs re-done later)