little improovements + UI changed