close #44
close #45
close #12
New button added