fighting more layout issues