more image fixes for other layouts