Button addition and minor changes