Ui improvement. wip

Signed-off-by: Raphael Catolino <raphael.catolino@gmail.com>