Update core
Update better UX and UI