cleanup indentation n stuff
affix sidebar
make sidebar look OK