Check in not working power monitor changes. Also start layout for
comments