Fixed multiple issues with sub views