Small changes on the UI

Small changes on the UI