Merging back with another branch
New bottom bar
Bottom bar is now based in an xml file and is modified in code.  A few more modifications are necessary.