Fix funky sub-menu overlapping
Cleanup