removing underline
fix logo location
Merge branch 'develop'