Added badges
View update WIP