Converted to angular, added image support