Restructure of coding on customize fe booking