(fix) server error and client error
Merge pull request #37 from renderf0x/dynamic_menus

(fix) server error and client error