Add thumbail support back in, remove whitespace