Fixed wonky layout issues