Clean up styles, add styles for buttons