[FIX]: small fix for menus and secutiry messsage fix