Updated front end stuff