adding sidebar to portfolio items and other stuff
fixing merge