Add sidebar and clean up some things.