BorisIvanovic - Quick refactor of some labels