Re-use headers and footers consistently

- ensure collapsed menu works i.e. JS loading correctly