Scrollbar fix and decimal moved to the state