Fixed UI logic
Introduced Label