Moving to new location and fixing incorrect nesting in sidebar