Push minor changes, will merge with main-footer branch