Cleaned UX
Merged