fixed some stuff and updeated views
Merge branch 'develop'