Added option to site_header to allow a custom span(for twitter bootstrap). Calendar page needed this. Other minor updates.