clean up organization of callout elements, clean class names and simplify css