Modified the UI slighty