Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Improving views with new desings
Fix:)
Solve conflitcs