Adding UI changes. Final version