Fixed UI and logic on lab 4 part 1