updating frontend to match master