Improve draw options layout