Suggestions and button fixes