changed UI part 1