started work on cleanup of setup screen