Updated GUI Drawing