added high z-index for bottom bar
Merge remote-tracking branch 'upstream/master'