Initial UI
Fix ui
Merge branch 'quick-'