Changes on drawermenu and utils