fixed issues from week 1 and working on week 2 UI