buttons etc
lots of changes