Bug corrections in controllers and more UI improvements