misc changes

major work on buttons