UI refactoring

Change-Id: I1f18569fe59efe60d0eb7a86964f232c5b935e81
Signed-off-by: Iliyan Velichkov <iliyan.velichkov@sap.com>