Redesign UI and separate styling and logic for version 1