Magento - fix paypal token and other small items

We have a Magento site up and running that needs a few things tuned up. Due to time issues we are interested in outsourcing these items. Site is running on Magento 1.6.1 and has had an occasional issue with Paypal. Paypal has identified that the problem may be due to the one-page checkout loosing the token. Here is the paypal error: PayPal gateway has rejected request. The field Shipping Address1 is required (#10727: Shipping Address1 Empty). The field Shipping Address City is required (#10728: Shipping Address City Empty). And Paypal's response: We went over the flow logs for the date in question and we did find 2 transactions that were rejected with the error codes discussed. What we found is that the SETEXPRESSCHECKOUT API call for the Mark is not passing the required secure token. The ECS checkout shortcut is passing the token correctly. We think that this is why the system thinks it is a direct credit card payment in which case it would be looking for those shipping address values. In the event of a correct EC call with the token, the system would not be expecting those values because that data comes from the customer’s PayPal account. We can see that when your customer chooses the ECS shortcut button, the token is passed correctly and the transaction is successful Assuming that your PayPal API credentials are set up correctly in the Magento shopping cart, we have to conclude that something in the Magento source code itself is causing the issue. This has been known to happen if there have been any modifications to the code, such as using a 3rd party store template, etc. ------ We would also like to clean up the layout of the shipping options on our check out page. For some reason that page jumbles certain shipping options. Should be an easy fix. (Only happens on the checkout page, fine in admin, etc.) We would also like to display some text that explains some shipping limitations. The text can be hard coded, but would be nice if it was an easily edited Static Block from the CMS pages. Job candidates should have strong English skills.