Removed unused layouts and increase number of tags.