Control cleanup & documentation

Added badge control as well