Modified the UI + incorporating the Scanner