Cleanded up the code in the Side Bar
Merge remote-tracking branch 'origin/EGBranch' into EGBranch