Fixing layout issue and duplicate class. Moving utilities.