Nicer styling for buttons

Better handling of text