Small changes in UI and function