Few UI adjustement