merged two of the html pages into the app, need to be fixed to work with MVC (remove the webforms shit), no gridview yet as that will require some surgery to do correctly