Fix the previous cosmetic fix with proper layout