Add more tags and fix css bug