fix admin page
fix export from excel
resolve merge conflicts