Clean up some logic on drawer menu