various changes to incorporate buttons