Refactor structure & remove dependency on blank gif