Worked on user tests, minor styling