Commit prior to merge
Cleanup code and rebuild brandbar