Refactored coding names

LEARNED SWITCH NEEDS DEFAULT CASE

Altered layouts