fixed TRACKER 2,3,6
#TRACKER-5: ui fixed