Fixed draw and basic formatting