Modified the UI a little bit