Fixing history layout issue