UI improve and new bugs