Fixing some bugs/css issues
Merge branch 'develop'