bug fix and width adjustment