Added extra columns. Fixed the broken layouts

Added extra columns. Fixed the broken layouts