Continued to work on refactoring of Thesis App