Imporve helper function and page