Added image assets and cleaning up models code