Fixed saving and added focus