Front end merged, functionalities added
Front end merged, functionalities added