UI and naming improvemnts