Cleaned up the UX