Refactor application view