Ironing out the UI so it works smoothly