button fixes and small changes