Bug fixes and adjustment to various View Controllers.