Refactoring & added images