Button bug fix && content update