Improving the UI
merge confilcts