Fix NPE

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
Adapt UI

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>