Added a setup screen for better UX, also refactored