moved sidebar to includes and added header/footer