everithing fixed, need only ui!