Deprication avoided, updated project
Fixed UI