Working on the UI
Some changes