Menu layout not 100% working

Signed-off-by: condor616 <marcelloangileri@gmail.com>