Refactored image controls into a separate widget