Multi-videos support / Improvements on the layout / References