naming conventions and put back to single draw method in gui's