Fix some typos & reuse sidebar partial
cleanup