DEBUG updated UI to work with FF