Fix php notices, cleanup comms preferences form

Fix some php notices and cleanup comms preferences form so it is easier to theme and empty sections are not rendered.