fixed design issues, removed tooltip again due to angular/jquery conflicts on iOS
Merge branch 'master' into gh-pages