add tags and reorganize main page