Fixed a focus issue and changing some parts.