Some balance page work
Fixed merge