Updated amu views and controllers to the new model