Further updates to setup pages