shuffle a few UI and server functions to be in line with spreadsheet template