CP Module Update

Possible fix for issue #295 and some minor styling updates.