refactor and fix amenity-points

next part of #710
Is this also sufficient for the larger font sizes?