add styling
Merge changes, and modify UI flow