Moved the points display
Tweaked some margins