Import Sean's changes from master into topbar and foundation.js