added thumbContainer, reshuffled draw order