Improved CSS for button and switch elements