fixed merge conflicts
added radio button
got toggle buttons to work