Refactor Application-view