I would like to see the timeout and lock functions separate. The timeout would continue with the current choices,to conserve battery life. The lock funtion should be a separate time-line,so you may choose a 2 minute trigger on the screen going dark,but lock may be triggered after an hour. It's a bit of a pain to use the current lock system,if you are a fairly consistant user. I tend not to use the lock at all,rather than use the pattern. An IPhone type lock (numerical) would be better.