Some refactoring + made the image responsive