Changed sidebar and fixed layout error