Fixed drawing stuff