styling improvements (nomargin class)
intents now replace targets more often than not