badge fix + empty states