Systems template / page edits / fixes