Added movies list and some cleaning