Menu draw improvements