Reworked app more along MVC format