Rewritten code for new ui

Signed-off-by: tomasherrera <tomas.herrera@koombea.com>