MBH: fixed broken side bars and cleaned up code