Fixing pagination styling up a bit and adding in the flash message.
attempting to fix merge conflicts