Many changes and some updates
Fixed up the sidebar stuff, to some extent