Fix Gii config error
Refactor; explicitly set main layout for contact form
Remove generated demos from way back when