Started working on the main screen to suggest disciplines. Lots of refactorings.