Little modification to UI