CW-899 Replaced the content view with custom one
CW-899 Update script to cleanup resources