CHANGE UX and fix BUGS