Changed UI to make actions and labels more clear