add logo & selection classes
merge stuff