Moved button container. Other small changes.