Final changes, finalized menu scheme, works pretty well