switch button, minor look fixs