Bugs/ui

Fix #1219 ( #1053 is the same issues )
Fix #1232 
Fix #1217 
Fix #1131