Enhance the Setup Screen