Little modification on UI