Remove span on menu button and add it as a style

This prevents bug in Chrome where clicking on the span doesn't trigger
menu popup.