More work on the setup page...