Fix img path
Refactor a bit
Refactor extending
WIP