Fix interger problem, add button