Refactored main menu code to fix draw issues

Signed-off-by: RMDan <dan.itservice@gmail.com>