7th iteration pull request

Things to work on: user's experience.