Added opacity and fixed draw order