Added nicer toggle buttons