factored out message drawing code to separate function
cleanup
moved some stuff around so that messages are drawn consistently
Merge branch 'feature/issue/#127_use_the_polished_message_look_for_wave_texts' into develop