Side bar change and more enhacements