code cleanup for showing content on side bar
fixed merge conflict