Fixed black text problem. Added some missing includes for the new GUI.