Fix cell layout