Refactor
Code style, readability
Make image view and it's containing view smaller vertically
Update logging