Refactored data_entries and fixed link submit button