fixes few drawer layout issues and drawer flicker