Refactor app design, update #13