major ui and controller changes