UI updates, add expiring count to homepage