More GUI updates in terms of conversion to MVC