change content size/padding calculations; small bug fixes