[FIX]Some fixes suggested, improves some UI