Some more changes to the App so that it is more elegant and easier to maintain