Implement tagging system
cleanup logic in tag results
layout changes