fix issues, update button style