Updated subscroll and mainscroll views/controllers