Updates to Front-End