Add styles to User page
Resolve merge conflict and update styles
Update stylesheet folders
Save user styles before push
Merge branch 'User_design_page'