Modified the UI a bit