cleaned things up a bit. added sidebar too