The problem with doing it online is that the HMRC site doesn't allow you to do the Non-Resident section (well, it didn't last tax year at least). I ended up paying for TaxCalc, which allows ALL sections to be filled in on your computer and uploaded to the HMRC website.