Updated layout issues