Fixes and improvements on Movies module