Cleaned up set-up screen