fix issue
little optimization
menu overhaul