Fixed Drawing Issues