add changing buttons plus smaller updates to layout