Added more media. Fixed layout bugs