System setup page functionality completed.
Other minor updates