Common component adjustments and some page templates