Layout changes, more functionality