Develop front end

Merge Develop Front End Code to Master Branch