Major overhaul - routing, touch UI bug fix

Also includes a .htaccess fix to point all site enquiries at non-www
domain