Fixed some style bugs
Changed border class
Merge branch 'Develop'