form focus fix and added location molecules