bottom bar change!
Merge branch 'scottDev'