Refactors and items tooltip added