Working on new entry button & form