various changes, buttons in wrong spots