Milestone: functionally finished
commit before change fixed style
added scroll then fixed