added instrument screen, generalized buttons
merging