making progress bar smaller
adjusting price display on buttons
Merge remote-tracking branch 'upstream/master'