Layout fixes

Fixed the number question layout bug and dealt with missing "approx"
value in the progress bar
merged changes