Bug fix and cleanup

Fixed bug not calculating name width based on selected font.