More changes. Fixed sidebar issue.