Additional buttons added & minor fixes