Merged front end with backend
Merge Front End with Back End