Changes based on UAT

Cleaned up formatting and made dependency fixes