Add component width handling option + bug fixes