Refactoring the menu

Signed-off-by: Ventsislav Dimitrov <vdimitrov@bitlendingclub.com>