Fixed layout issues with long text