Improved layout
auto-focus is now optional