fixed command stack scrolling so that it is not horizontally scrollable
merged conflicts