Added extra columns. Fixed the broken layouts