Button improvements and linting improvements