Modified the UI and Rifdhan's code