Update Front-end to match Master