Added saveContact function + some template and storage changes