Modularize the controls in the UI
Redesign UI and separate styling and logic for version 1
Update latest changes