Fixing minor styling issues and handling of re-send response