Lots of changes for #4 and app text is much more readable, presentation is better