Centralized elements and added some info tags