Updated App.java & some models