fixed issue but still bug on width