Bug Fix & dynamic menu refresh