Edit sizing and add autofocus