cleanup of layout files and code for the setup screens.