Some fixes and container view default script