Scott Refatored Naming Conventions For All Three Widgets

Everything working.