General fixes to make pages less static