further changes to buttons and layouts