Thanks @locks. Updated now - what do you guys think? Good enough now?