fixed some draw order issues (my fault)