Mve controllers to top and some opmizing.