Added live feed and improved matrix mode