Changed layout type for performance bug