Few layout fixes.