Worked on suggested-for-user, some refactoring, mostly styling changes