Added Image Component and Some Updates