Updated Frontend in Master