#654 Improve graphics